From 1dca74c331194fff91d899ea857e348626d853de Mon Sep 17 00:00:00 2001 From: Julien Grall Date: Wed, 3 Jun 2015 09:24:50 +0200 Subject: [PATCH] sched_rt: use the correct type for _cpumask_scratch MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The commit 376bbbabbda607d2039b8f839f15ff02721597d2 "sched_rt: print useful affinity info when dumping" breaks build on ARM64: sched_rt.c: In function ‘rt_init’: sched_rt.c:442:26: error: assignment from incompatible pointer type [-Werror] _cpumask_scratch = xmalloc_array(cpumask_var_t, nr_cpu_ids); ^ sched_rt.c: In function ‘rt_alloc_pdata’: sched_rt.c:489:29: error: passing argument 1 of ‘alloc_cpumask_var’ from incompatible pointer type [-Werror] if ( !alloc_cpumask_var(&_cpumask_scratch[cpu]) ) This is because cpumask_var_t is not a type alias to cpumask_t** when the number of CPU > 2 * BITS_PER_LONG. The correct type for _cpumask_scratch should be cpumask_var_t*. Signed-off-by: Julien Grall --- xen/common/sched_rt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/common/sched_rt.c b/xen/common/sched_rt.c index 59ead57e2b..5836d274b2 100644 --- a/xen/common/sched_rt.c +++ b/xen/common/sched_rt.c @@ -127,7 +127,7 @@ /* * Useful to avoid too many cpumask_var_t on the stack. */ -static cpumask_t **_cpumask_scratch; +static cpumask_var_t *_cpumask_scratch; #define cpumask_scratch _cpumask_scratch[smp_processor_id()] /* -- 2.30.2